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

Change-Id: I329c5178d1e1f453313f99ca9019ba9f7ba3fa8c


Trivial merge