Merge changes If6b35e94,I72a9502b,I0c1ce9d4,I73f12b2d am: 81bbf7260c am: 1682ce635b

Change-Id: Ifeb217ac1b1a43fe8de9317dea679865771a098d