Merge changes Id9534a59,I3ee81536
am: afe45ab5f2

Change-Id: I36290408af2ac500101e30a139c26091c510834f