Android m preview 2
Merge "Fix RTL layout issue"