Merge changes I082e323e,I326bf776 into nyc-mr1-dev am: c991a7ad54
am: fd1da97fc7

Change-Id: I3b9d145af200f1a075dc65c334fff49c1a4adc26