Merge ee0fa20a1d35466b22264116eaeb957495ce6667 on remote branch

Change-Id: Ied23f1294e16704e4eb66d6107a2c32b3735d7f5