Amend singleChoiceItems where it is not a permanent/visible choice

Change-Id: I8e4541e320afbfe8a29231d96d1a1f6ac36078de
Signed-off-by: sethyx <sethyx@gmail.com>
Merge "Amend singleChoiceItems where it is not a permanent/visible choice" into jb-mr1