Merge "More complete initialization of AuthorizationSet" am: 058085425b am: 17138ac95d
am: 4779725282

Change-Id: Iab0a5ccfbf23340d0e890505924a52fe7cba74bb