resolve merge conflicts of 3ffc2f2 to master
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 19:05:21 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:05:21 +0000 (19:05 +0000)
am: f2c82779ae

Change-Id: If42ab81eae41f7e0c61abb4997df4221361fd0b7


Trivial merge