Empty commit

Work around a Gerrit issue.

Change-Id: If118caca3e9264f7dd88e554bb9d3cd219cb18bf
Merge "Empty commit"