Merge "Problem in building AAF permission - fix"