Merge a31e5d91be49547543d6855a49f9a4a8fa33dd79 on remote branch

Change-Id: I61dd1e6eccb9580003d1fe43793206b8e4036e01