Merge changes from topic "am-66c554504b7b40cba2cd0cea8e47e323" into nyc-mr1-dev
am: 2265f3afd4

Change-Id: Ia5dc10aa6944897e49d54d7e96235f8bfd771464