Merge "Redirect Value Source of SignalStrength Constants" am: d1db62d59e
am: a7381e9af0

Change-Id: I2b909a24dc2bfe49379a6899c3f7c29cb1d20f78