Merge 6f48ca73839b5d99257fbc28f148ef0a69d4ed2e on remote branch

Change-Id: I14ef08402592060ec44ce66e124c49446eea60ff