Merge d3f3af2a40894f329244b12de5d6e55dc2cd689c on remote branch

Change-Id: I445a13bcd73b1253315636456462181480b11802