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

Change-Id: Ie26680bf227427c05167af7a32313f199ed7ae7d