Merge 59b54d6c844c6ad49f866e46079debccba82df10 on remote branch

Change-Id: I914e5d09c242e247c2ee76a772bf7fccd5bd7851