Merge changes I0a1aa003,I000c3c22 am: a4a1f2089b
am: e69ccc7fb6

Change-Id: Id717496b81bab6a5357c7f7783805c206cffc893