Merge changes Id091acf5,Ie27b07ae,I701a2582,I32122d77 into nyc-mr1-dev
am: c403756422

Change-Id: I2caada2b0d026edf00ab06caaf95de68c8abfa4f