Merge changes I9d3a049f,I0d52ed5e,I556435ca
am: fea8cb29b9

Change-Id: I301b32b3558f2370d81d2fa31d7f9c00d74a1b75