Merge 27d2d9c800ea08f2f27817a66e01330fb0c08904 on remote branch

Change-Id: Idc286a58c1bae3eaf513160efbdbf6f738cc3bb0