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

Change-Id: I16bdc20c14b0edaa5bbc1457ec55fd3e78dd1515


Trivial merge