Bug: 144854916 Test: This change is only to ensure the changes build Change-Id: I62b247b45454861328b6062ed571c854a374aa34