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

Change-Id: I84d6eef76c74e0733c9f2b7f0e5e562564528664