Merge e4a0427e03ae7927d1db9d70bcc14d8ddc2dd2cc on remote branch

Change-Id: I27a10678be8a680f7de4752cff22402f99f63608