tree 1c984b3c67421c4c7c99096bca6d52c6cfce76fe
parent a0eff56a4cfa73d5cac6da68e54291420db165bc
parent 3ceaacc431c419559508d6f991db5aadf5894732
author sqian <shuoq@google.com> 1502753467 -0700
committer sqian <shuoq@google.com> 1502753519 -0700

resolve merge conflicts of 3ceaacc to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic688982b8d16a7d42cafdf0d76eb6ec931322b1e