Merge ee1b82cec54349ed65a23f8348285b692288f71f on remote branch

Change-Id: I8d67cc3752a6ffe011a7f46dcc4188f0c53c0db3