Merge cc5d7a23b0a7f8c0d03e10d9d0b2311f4b1e9e5c on remote branch

Change-Id: Ife9c852d28e46265cae8e6f4cc46238f076d078a