Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev
am: 19063c12f0

Change-Id: I47143f087d2b880301afada9e50d5a84995b04d5