Merge f621aba685cf6cd8851d97571e222981a1a9e345 on remote branch

Change-Id: Ib56053c59589828c59fca7316af97c58effca33f