Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev
am: 50d4e94767

Change-Id: I05fe6580c2bf6a44f5fadda55fa5b2d944d9be9e