Merge 883ef1477d8bf23c58bccc18fc819d439ad1dbfd on remote branch

Change-Id: I7797c17aad5cab13d56ba68bbc2721d888dc5f06