Merge "Preserve left+right compound drawables" into nyc-mr1-dev am: a58ff1dd87 am: 5f7d81166d
am: a429f1c0eb

Change-Id: I3c748e6369e16237a52f927ea4b1c4326618b79c