Merge 698b7f1312bce4d22296d610d3db1b0ac46ef9ca on remote branch

Change-Id: I37519e9181ea29e2ba9871ebd67f6e02bfe94230