Merge "Fix RNA crash" into nyc-mr1-dev
am: f09b5d7a78

Change-Id: If4495794212e8567daca1da404eceb04e3c3992c