Merge 604cb56c7e6f78e895d14376fc095bc6a90e1351 on remote branch

Change-Id: I9d1e439b650436b6f46be7be5530a51f0402cac7