Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev
am: fa5fbd299e

Change-Id: I69ecb56beb12c40de5e3ad61bd86af49ea86ef5c