Merge 116a593b55d76ea3ff9e5f8edffe44ca6a0e833b on remote branch

Change-Id: I54ca3780c5f76c1db97b66c81ccbbd55bc1f3797