Merge changes I760cfe22,I377a81f9,I5ce74cb4
am: 9b1521edb4

Change-Id: I4687cc778e0ffa24dd80d13f1bbb92e83e8efdb1