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

Change-Id: If4365f376e1ae7b2723de6f05d7f6b604ae23373