Merge 74cf0b5f7a6804427769539f9c0fe2090fb02a32 on remote branch

Change-Id: I94f402b4e62ed2f56b30ce8aa29740536a066fc0