Merge changes I5e93fcbf,I9d4c8bcf,Icd580aae,I7b2399a4
am: 5b9832748f

Change-Id: I54b572fa308ddc906896f5dc05771ff14b510bcd