Merge "[DO NOT MERGE] Fix context menu position for RTL" am: 80ae7124f5  -s ours am: e715e2162e  -s ours
am: 9059147479  -s ours

Change-Id: I3e3914690d8e8c42d247712a041954f6eafe2387