Merge changes from topic "am-4cce2137e87344a1983525827ec480bb" into nyc-dr1-dev
am: 72cfa9ee7b

Change-Id: Ic171811423b14a084440830eaac600a4d6bf2e5f