Merge changes from topics "caps_refactor", "phone-cap-revert", "radioconfig-revert" am: 48da0e3fe2

Change-Id: I7028108645ed0bcfff1519fb9b1846e3878e93af