Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev
am: 39e6bc7495

Change-Id: I9bce38d411fa55aed455a3de2dba9d16cca4db6d