Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev
am: 7ba7f0edbb

Change-Id: Iacb373edc5d77064b59ac7f91121beba140a43ce