Merge changes I9f36cc26,I06561ad0,I42c2a8d0
am: 3a38310476

Change-Id: Iba85a446a745323c1c9645e2b6421c80ff598272