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

* commit 'c6074d69292f21e9d9b054c0c6cb464a3523866e':

Change-Id: I87153abff84e64e17825181f0bdac32502f211aa