Merge "Fix RTL for Nav icons" into oc-dr1-dev
am: bad473d147

Change-Id: I211be901cd264c3ff4f505abf54dd1d9d8c7667d