Merge commit '528961a61d99280e67fbb13b78b3d2538c3025d5' * commit '528961a61d99280e67fbb13b78b3d2538c3025d5': Handle expiration of discovery mode in system server.
Merge commit '528961a61d99280e67fbb13b78b3d2538c3025d5' * commit '528961a61d99280e67fbb13b78b3d2538c3025d5': Handle expiration of discovery mode in system server.