Merge 18b036f150e8b83f31dc38f2b7f58cfaf06253b7 on remote branch

Change-Id: If9ecd50708bbfa1316b2aa50dc5411f12d7b2b88