Merge pull request #315 from jcastillo-arm/jc/tbb_tmp9

Authentication Framework