Merge changes I34ba5757,Ie65a762a
am: 63660add3f

Change-Id: I9a3c5dda5edbbcbeb77f519eb6218a5e00d2fdef