[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f7802275 am: f4e8657a am: 2d3b87ce am: 5558a644 Change-Id: I18ed33baba1b8e4286b24ba27e9a7bd0dec2306a