Merge ef17ce3fa7cbb4fbb2305080632f722ffce1fe47 on remote branch

Change-Id: If057dcb678afb3234e2c3b1976e89ecc87306c16