resolve merge conflicts of 1038297e29 to nyc-mr1-dev-plus-aosp

Change-Id: Iea94c025a346d9b7d02b4968b98256dc87ed493d