Merge changes I1f55c6e1,Ib2adcf0a
am: 395131df7b

Change-Id: Ib0b871e1982828016cefc71976a0e5421388d004