Merge b37ba316643bcfa2b4893f25f0578e23077b1172 on remote branch

Change-Id: I6e68476da089f8f7fd11fa674ce09e141d8999d8