Merge changes from topics "ccm_bw", "ccm_unmetered" am: 5dc0d90aad

Change-Id: Ice31e2b3fd6b5c8d718836a95c889f1ed8b1a60b