Merge "Merge changes I6e89439a,I9d9aafe6,I38340654,Ie50a9d37,Icd98abf5, ... into nyc-dev am: 63fd900686 am: ee19fe0446" into nyc-mr1-dev-plus-aosp