Merge 4820057e9e7deb1488de5fe2df877aac19cf4086 on remote branch

Change-Id: Ifaee9c5eebfe2acd57683c485e9ba0c62a732c7b