Merge "Fix Yamllint violations for jjb/armband"