Merge "Update drawables to fix CTS test failures" into lmp-preview-dev