Followup commit for I3ee6cef4f89b

Given access to jhernandez to bastions as well

Change-Id: Ifbfcd74baaa564db3c870d1a824df170cfa57379
RT: 8951