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

Change-Id: Ia8661e514136f8d7710a4155770510cfd23ad74c