Merge "More complete initialization of AuthorizationSet"
am: 058085425b

Change-Id: I9962c5e324baab4774996799dcd00d7de47f59c9