Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev