Merge 855cb36ddd297b43f7788a2a1fad0b80271668eb on remote branch

Change-Id: Ifb0990042ab8f5bacf5fe2807075842d458e9bc4