Merge changes I50e27f46,I0b7cd983,I3639fdee am: eace8e2e53
am: d27a1e4208

Change-Id: Ic27190b4e8ce7afe07214df48588f8f3a9a2c65e