Merge \"DO NOT MERGE: FloatingToolbar - Check that app supports RTL.\" into nyc-mr1-dev
am: 63b31d5729

Change-Id: I77c82ad4ce15368c92041d994e10c8a44a33667c