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

Change-Id: I1c095e1dfa92d6d2d877e15ea8bed6da9f9652b2