Merge "rs: silence static analyzer complaints" am: 73215be5ee am: 88ead34317 am: 85c9803285

Change-Id: Iae9a53f18d31f87b6152e8a15b17ea836539c7d2