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

Change-Id: I73b8c40a628dde30e1ec647b24ae21956e33f9cc