Merge "Resolve handling of supported signatures and digests for max SDK"
am: b510ca8c8e

Change-Id: I87335c347fdbf237f488509abad17cb11bf676f5