Merge f9352ce140a60ec79fd0c352c3a1e4de33c9677f on remote branch

Change-Id: I9149964ec829230641a55797c18d1e1ec12a5f7b