Merge 6c24a780e2140b303a843091bb4ce6aee8a280d4 on remote branch

Change-Id: I68592bf0b730311ffe469dcf2b41ef82a113ab95