Merge changes Icb29d2da,Ida906e21 am: fc868645e2
authorPyry Haulos <phaulos@google.com>
Fri, 17 Feb 2017 20:27:58 +0000 (20:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Feb 2017 20:27:58 +0000 (20:27 +0000)
am: 1cf9161f6f

Change-Id: I53a2d1d2533a5007914ac1df02a8b0f726ee043d


Trivial merge