am a507ceec: am 226cf886: Merge "Fix 2 lint warnings"

* commit 'a507ceecfa8a40f02ef8124d9626c51de69f43ed':
  Fix 2 lint warnings