Merge "[UTC][accounts,contacts,calendar,context,fido-client][Non-ACR][Svace fixes...
authorAmritanshu Pandia <a.pandia1@samsung.com>
Fri, 18 May 2018 08:57:47 +0000 (08:57 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 18 May 2018 08:57:47 +0000 (08:57 +0000)

Trivial merge