Merge b37ba316643bcfa2b4893f25f0578e23077b1172 on remote branch

Change-Id: I505ed201ee1f01ce2f4555106e24092aaa1bed30