Consistency fixes for Commons Android app

Change-Id: I47052ac40924190f8619f3bc80cea9a8d5618ee4