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

Change-Id: Ib10c8c18788fe513b3d9deb38604a4b3c8b226d9