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

Change-Id: I1b7ed8b3b1ea0d5bfbbfeba516bd32811c2f655c