Merge c0452f50ca415c095f3c680a790d597955177fc8 on remote branch

Change-Id: Ic308bded8c1814c7a7ac4923a9eee779b1b641a2