Merge changes Id60fd5ee,I4c7b68ad into nyc-mr1-dev am: 4a051a849d
am: 2ecab544a0

Change-Id: I042ce5ac54c23da088e75bc61ad65e2f88c68785