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

Change-Id: I1754833ed6780a95dff8c2266dd0a330c0be3e07


Trivial merge