Merge 6e509dce746b3c89b2f269d4c344c874a315f63a on remote branch

Change-Id: I0f767d4f9af86b4761b5d4e5372f7f27cdb6ec49