Merge cb6da48bebca9e663451b208ce25e1f80ee1b496 on remote branch

Change-Id: Iddc6a77bee99ef0583c6e2e701f215aef0ff5afc