Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-dr1-dev
am: d55784db36

Change-Id: I2fd44e45b88f16eafe1c52cf73b94823df3655cc