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

Change-Id: I03f89e81c7d4028ac9de7c2b6519b0b83da52cf5