Merge e1a4d59ebc986018ed5e0f36b95a9ade8dd4e64a on remote branch

Change-Id: If32728d037f5c59ef7dfcaedb95d54c4fd4620af