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

Change-Id: Ia9114921103cfd62aa0452f9a9564a0c7897efe0