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

Change-Id: I01671dbe0b18133b74ad1a9b3f6e4b8116d7490c