Merge baaa98289b4808ecd8dc82bb3227cd7e6b65c242 on remote branch

Change-Id: I999053159624238a018ec79c6ffe8d35b9315d44