Merge 32e6dc094c491e6b485fbce6c66610ffba41db67 on remote branch

Change-Id: I35124def8fca0066ba7eb6194412d7aa92879ce6