Merge "Finish revert of Change Id9635df8 begun in Change Iffa0f2be"