Merge changes Id83aa0d7,I91211641 am: 1bec084ee8
am: bd48570ef9

Change-Id: Ic53c78d55212d1969b6d3e2d9591fece8314f61a