Merge a2915cd6f98633dce26c5ec9f9dca76985498d48 on remote branch

Change-Id: Ic0cb2403c96a99605ce01f060a26aeedb330257a