Merge 49b9b883950e7f9a571d47ec624b6c6e942cff22 on remote branch

Change-Id: Ib9d791026ef8c90b314b41e993aedeb5e9ae66b4