Merge changes I4585b9d7,I90b48eab,I1f3e38d2
am: e635220095

Change-Id: I049a044fb59f84e3411b8a8a1ce32f2f4114580f