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

Change-Id: Iad519b2a47b619a0e0fe828ce258ceb457c7b1d2


Trivial merge