Merge be607673d427e72102a4358ae9cc8f23fee6e3bc on remote branch

Change-Id: I6741f5d26aacff11005047ad9f66b869679e530f