Merge "Fixed the issue "set default" is not shown" am: 41cecada26 am: 04e39ef2a6 am: e24eb721d6
am: 43a7c51970

Change-Id: I7483701c7f51a9f8a89d2339ca0d05425139bf8b