Merge 4d890519248934c67e9292ec5087bf970a38222f on remote branch

Change-Id: I946cf27cd484a8c1fa149a0a623026aa71e2ff58