Merge "Reduce toast duration for channel warnings." into oc-dev
am: f6e956b1c6

Change-Id: I5a28910fa155a17256655ccd2cc0dc341dc3fbc3