Unhide new channel masks and deprecate old channel masks

Change-Id: Ie95a38e782fe491ffc2f2670c2b9f52afb33abdd
3 files changed