Merge changes from topic 'am-afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am...
authorKalle Raita <kraita@google.com>
Sat, 21 Jan 2017 01:09:10 +0000 (01:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 21 Jan 2017 01:09:10 +0000 (01:09 +0000)
am: e6a281d8fd

Change-Id: I0ae8f1f512b0af560f9ca6eb3b32051a27cbc784


Trivial merge