Merge changes I8b3e8a3b,I4976abef,I31dadb9c am: a2fd28ee06
am: 33762ff915

Change-Id: I4e244fb4240c12a45489234c04290fcd7e972dec