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

Change-Id: Ica7d3e7ea993cb6ed9a97357089f2667208bccbb