[automerger skipped] Merge "Use Database number even radio indication is not...
[automerger skipped] Merge "Use Database number even radio indication is not ready" am: 078bd27b am: 1cfd9c39 -s ours
am skip reason: Change-Id I79385c9cbb1be66c00f818f6c3712bc0f010425c with SHA-1 3d809f74 is in history
Change-Id: I0e86d8c96a229d162b94cafac5f8bcfb3811a9bc