Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into nyc-mr1-dev am: 7591071f2c
am: f60910e208

Change-Id: I46259f7f3547c0f001391a093a4794cc836bb072