Merge "Preserve left+right compound drawables" into nyc-mr1-dev am: a58ff1dd87
am: 8f9a055987

Change-Id: I8379f3ed97be865722c3caad5ad9b3946cc6c33c