[automerger] Merge changes from topic "am-8314981c-ed3d-43de-9fad-ca64c8335f8d" into nyc-dev am: b16a54d4 am: 691d8564 Change-Id: I3fc90aa22dd9f3e186f7e3945d063cad0010ebfa