Merge changes from topic "cherrypick" am: c4b647458c
am: 130aacd566

Change-Id: Ic7129fd819d50f74dd8e872be1f8813cae7727dc