Optee 140916

Rebased on integration branch addressed previous review comments.