Merge "Bug 1731: Breaking dependency cycle between features-{mdsal,aaa}"