Merge "Avoid automatically mirroring Drawable of CustomTile" am: 9a904d68c7 am: 9531933797
am: b66feeffac

Change-Id: Idf7e4429338e90841ec1fb78381b2c7c8c638092