Merge "TIF: add helper methods for making a channel browsable." into oc-dev am: b2eb818a7d
am: 3d9ecc264d

Change-Id: I321131835e44d67bb5fab085bc7f36a838dd40e3