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

Change-Id: I0bd3fa65bf2e456829fc609d3cd743c0508f856d


Trivial merge