Merge changes from topic "b23270724" into nyc-dev
am: 45a05eb567

Change-Id: Iee4799062b31b85d92fd2a1ca9ca1000839bc7e6