Merge 6eed519bf41c43637acb509a3157f0e599220c5a on remote branch

Change-Id: I5ebba305b3b7f31290cb524712b621d5f225fd06