[automerger skipped] Merge changes from topics "swizzler_hbo", "JCS_RGB" into pi-dev am: 71550f62d2
am: f1429b55a7  -s ours

Change-Id: I7795226cc7f1c1abfd7938a1fa9cba869a02622a