resolve merge conflicts of b81edb4 to master am: ce5292f584
authorDavid Sodman <dsodman@google.com>
Thu, 22 Dec 2016 05:31:14 +0000 (05:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 05:31:14 +0000 (05:31 +0000)
am: 49ddc6319b

Change-Id: I4b005cc60d389d784325429bf1c0efef4396f8fa


Trivial merge