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

Change-Id: I8a895e2ebd3d538ab1b8b959e70faf265fb1bf92