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

Change-Id: I10ff669ed59664e2c6c4db039f662d5f6437a4ae