Merge changes I5b05e23a,I9350b250,I1d66b42a
am: 393a1fd02f

Change-Id: If6e778443603c658483cf94d73ff9bec9bd4297f