Merge "Merge changes I6e3f4da2,I8acfbd1a into nyc-dev am: 1a97cbd4ca am: 8e03a859cc" into nyc-mr1-dev-plus-aosp
am: 8b6d1d59aa

* commit '8b6d1d59aab477b858c2dd957f45f0b31c8a23a2':

Change-Id: If84a57d29e4f83f5ff7bed02334c1afc0c21e99a