Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-dev
am: ce05315be8

Change-Id: I90cc16f5bd89cf5c9f5da3b71e30e6b25fe59db4