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

Change-Id: Ia26593ab5b53c34656af1095f63bffa9ebcde27f