Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev
am: c65dc5529e

Change-Id: Ib3cbf980a9779c5f9ff741ac9109a20bea549cb3