Merge changes I760cfe22,I377a81f9,I5ce74cb4 am: 9b1521edb4
am: 614010c851

Change-Id: I368f7b826cdfb2a789df604155bc763c3623e2b5