Merge 8896aca5917243cf1827dcf7eb9b4b5822141fe1 on remote branch

Change-Id: Ibc15dc75ad76a5cac7a4777500bfbc8f2f99b347