Merge c4c0b20e9c518b8c9ae46e39582147edce179836 on remote branch

Change-Id: Id7bece3db959b9ed46eb07df07ba10c27825c209