Merge changes I8314904c,I030bc811,Ic2863116
am: d8a457ec52

Change-Id: I6875c362a75121828b7437432b3e71b5dcc187e7