Merge changes I784bea3a,Id3b2dfdc
am: b42af0eb5b

Change-Id: Ia19b7e16a063e1e66fd467a28a0954195eea88ca