Merge changes from topic "am-4cce2137e87344a1983525827ec480bb" into nyc-dev
am: 82e4ecfee6

Change-Id: I984ddceaaf9f805e69223c3ef1f26b477ccb2868