Merge changes Id8170206,I4e63ef1d,I05e176ef am: 21de509b13
am: 9d22414b82

Change-Id: I0a8fbdca0851321c5bd878a5ad1fd9cb2bb10158