Merge changes from topic 'am-4dab53af72514176a8145c952e9ba8d8' into nyc-mr2-dev-plus-aosp
am: fd8f8ae119

Change-Id: I7fa653913e5905cb3164901198a55845b7b5cc9b