Refactor headers to create explicit dependency am: d4842e849a am: 95c7c07ffd

Change-Id: Iadb7fb92b16e4720b05f991b8be3ffc8ab7caa3a