resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284

Change-Id: I7ecce86e58af545aa18ea25e16978a1dce9dab8e