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

Change-Id: Ia7a6d74f3dc18e2fbbf7d3eb249afea9bd576957