Merge d76e1a4745e6ed5d26f2c670830439d1dd4a156b on remote branch

Change-Id: Idf08d2c0d98760de1891212e2aaf85796b2a1949