Merge changes I1042e87f,I58b17ecf am: 5d3357b6f1
am: 29c453abe5

Change-Id: I05d751e1c1f9347c2b04ce66a78ebb94c1b25e17