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

Change-Id: I6edeac6d72d6f3471bbfc8f39fec282567441e82