Merge changes I1bf07301,I48e8ebf3 am: c17c5b00e1

Change-Id: Ic71d8da7d163b931f79edbc2d92063e4d3cac049