Merge "Guard against crash in RTL." into nyc-dev
am: 4e9348c

* commit '4e9348c7bbedce2fffeaf6fd79d63ae1c104368c':
  Guard against crash in RTL.

Change-Id: Iad5e2f885b83b7231f84b3ebc1ab34f435102bf1