Merge f9352ce140a60ec79fd0c352c3a1e4de33c9677f on remote branch

Change-Id: I8f50fff77cab24e447592060c281be7de74009a9