Merge changes from topic 'am-ee884cf0aecf458e82b1ef62075c2045' into nyc-mr1-dev-plus-aosp
am: 85bc1eb580

Change-Id: Ic704a714880fe8943239167c88a10d504a040199