Merge c345e85dd4874d98e565488689f4b070b7e29fa4 on remote branch

Change-Id: Id94146155f58e65d6e120d4ed8287f8a750b5434