Merge 79f98daa43d84b09f6b0c00bdcda45320d946f35 on remote branch

Change-Id: Icd0324b590c316f7fdb11c5a66b6c74d8a41615e