Merge "Fix data disabled icons in RTL" into nyc-mr1-dev am: e4a53a3677 am: 70fc5b1bf4
am: 12c95006c0

Change-Id: I5afe57e4f757b8b38a1af258f897c9ae68c0ed9e