Merge changes I506bc2a8,I7310de97,Ib3fd1110
am: b865d9af3b

Change-Id: I10857e8a53f787b92e3aaea38b57c5e7735bfaae