Merge changes I1c1445ba,Ic0c8b163 am: 309d6dde31 am: 88dc450050
am: 37b206bbd8

Change-Id: Ia240fe4b020208bd7b90270e62595b61cc26bf0d