Fix up resolves to minimize differences to internal code. Test: m Change-Id: Idbacb6ad14c43aff8030d70b5e17427b86e92d6e Merged-In: I4e06b3f93e30ed1c7868ec9e018709a7e796e441
Fix up resolves to minimize differences to internal code. Test: m Change-Id: Idbacb6ad14c43aff8030d70b5e17427b86e92d6e Merged-In: I4e06b3f93e30ed1c7868ec9e018709a7e796e441