Merge eeab07bda132ecadb1d16c5ed2ba09e1eb6c56c3 on remote branch

Change-Id: Ie2c73e2b299bb4f0fa14855b6a396f2f09c76f93