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

Change-Id: I31e712ebb6d9b4c2c99e8d6c220d248b92ef124f