Merge changes I76c426ae,I204f2f6c,I7f4cfc18
am: d4ea1b3b84

Change-Id: Ic3d3d90f3cc997904083e881fd03fbba3ae57d22