QA: rubocop updates

Change-Id: I580ec597dbb0d1dcd0830233995f94bc27d10278
Merge "QA: rubocop updates"