Merge 6505455d38d6c0663eb0b52ba7f3015ef04eeda5 on remote branch

Change-Id: I3d551ff533967f1ef5c06b8b6af87752ad69b1ad