Merge e870ef286d85a4515ba2884a2babf6a917ddc682 on remote branch

Change-Id: Ie0e8984c9d664dc427e702e3b7e8b55b00a17056