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

Change-Id: I5cf3c07071c57c362847133c8858227d58662ce8