Merge changes I5286112b,Ic5701d67 am: 2afb85a26b am: c18dd92433
am: 58cdadf591

Change-Id: I86ac9c83115c15adb79bb4cf290f5556a83b6567