Merge 2e5d5ed2a8632704a671c6ed3340d70ee8c714b2 on remote branch

Change-Id: Iec569467d3e74e003bd51a84c88c65fbb1972a3c