Merge "Change signalStrength to int."
am: 73818566d6

Change-Id: I8a9afddc749afc216dc1dc16f0465df1d0dab24f