Merge 492b1e04e483eeb999787589654db578e050b571 on remote branch

Change-Id: Id33d67183ca4ddf266cc79d6acefd82ee5cfcfda