resolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71
authorPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 20:09:31 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Sep 2016 20:09:31 +0000 (20:09 +0000)
am: 29baf28a2f

Change-Id: Ic5e033debdc6cafba026c9f40efaab8c4f83f746


Trivial merge