Merge "Merge commit \'9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev am: 0418406186 am: ae8784bbc8" into nyc-mr1-dev-plus-aosp