Merge d2481e67858952dbe9842259af9b662d9ff326b9 on remote branch

Change-Id: I566b2d1359601900370c8672a8fab1607828472f