Merge changes from topics "swizzler_hbo", "JCS_RGB" into pi-dev
am: 71550f62d2

Change-Id: I1cd5e7cc1e1539e2fb152b3f737060aa164d7575