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

Change-Id: Idd11105e84a891d593e318c1a267bc4763f7a8ca


Trivial merge