Merge 1e1fac45ea59699edee6cc5d41305478b04a7d65 on remote branch

Change-Id: I1ba2d96493d77a4d5c6c3e5254d54f36021f64bf