Bug: 31559095 Test: Build Change-Id: I1ee9fb492137c6c16f0d02586393837616127972
Test: links Test: (sanity) boot marlin in recovery + to system UI Bug: 37512442 Change-Id: Ie19c02bda9df7c0cfdeeaf34c48f251b2b93961d