Maintain compatability with current hardcoded scheme for now for commit order convenience. Change-Id: I0b8299fceab1cc405ae5f26a129f2f1ea3d56773