Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into nyc-mr1-dev
am: 6adf95f76b

Change-Id: Iae3f2cb9eb2d6bce2c23ff243a56aea0480c760b