am ac869d90: am 53cb2ba4: am e4a44cc7: am 5b34b3ae: am c361b6fe: Merge "Small tweaks to custom content management" into jb-ub-now-jolly-elf

* commit 'ac869d9031182619d8672e87d3fad2e214a1c38d':