Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8" into nyc-dev
am: 54fff8435f

Change-Id: Ifb3d6a0243a29722591b884b9567ad77b3215e77