Merge a31e5d91be49547543d6855a49f9a4a8fa33dd79 on remote branch

Change-Id: I4dbf1562854e4b0c11dd3348cf63a2dc039f342a