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

Change-Id: I5524fb9992aacac7b2bb78048f0b1243c5a03bf9


Trivial merge