Merge "Re-add default channel on app targetsdk downgrade." into oc-dev
am: 4c11bde01d

Change-Id: Ied0dc35d017d7bf716a121979e6839c3b2ec494f