Merge changes from topics "cdma-null-island", "cdma-signal-strength"
am: d5ba391425

Change-Id: I1cd2ae9a3110f6c49cacfc3137c009a1e04227ea