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

Change-Id: I308634e88296bf6e9c8762783ffe47f059ee61b7