Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I8f602eed512285de840bbadceefb88fdbd652780