Merge cae17bbc52f505b5d09b4dd36ce3e74b21e245a8 on remote branch

Change-Id: I3b0da74d680278f46a5e96208118d4d009e991bf