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

Change-Id: I79dd29815a7c5dcf2e0df37391eed135263edadf