Merge changes from topic 'am-c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev
am: f6f4f1ac61

Change-Id: Id3d8f253b1db24c1bb383bda9e005fcb8c59ad2f