Merge f56802f613e2522c358772034dbf2c54ecc56d54 on remote branch

Change-Id: I69b32c3efed2e443596ad39e83128e9b3aa1afbf