Merge changes from topic 'am-afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am...
authorKalle Raita <kraita@google.com>
Sat, 21 Jan 2017 00:49:06 +0000 (00:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 21 Jan 2017 00:49:06 +0000 (00:49 +0000)
am: 30d7647d1a

Change-Id: I30204d8e3c73d29c648e638a7d3b85a2369e7c87


Trivial merge