QA Misc.
Replaces and Conflicts Tag
@EasternHeart please approve this then...
foooooo
ihhhhhh
Going to edit in cell phone
Merge branch 'master' of https://github.com/AOSC-Dev/autobuild3