Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp
am: 8db381c0a0

Change-Id: Ia890077286aa752b237739573efc865136fe1b89