Merge "Merge "Change signalStrength to int." am: 73818566d6 am: 762e0c1162 am: 7e80c3f00b" into oc-dev-plus-aosp
am: 74714d0323

Change-Id: Ibe71de241facf5af39423da96801b275712744ce