commit 7 fetched into gerrit
(cherry picked from commit be966573b02abae0179e2c201e6827cda5ea08bc)

Change-Id: I6c3e8dad1cf11427dcf658e5754f29fea7133172