Test: I solemnly swear I tested this conflict resolution. Merged-In: I5afdfc8e1e523768db9065dd3571cb31bc1dfac5 Change-Id: I5c5b85f516dba0d403eeee06055953931d2198aa