Merge changes I5775d732,I27673017
am: 719f925df0

Change-Id: I3d0a694cd914482cb07454c102fd3fab1b54644c