Merge "integrate portal webview to the default app" am: e3ece71f2e am: dd7ff3586c
am: 916aef7eb8  -s ours

Change-Id: Ibb9c094dcb41bea9749f0a119464ee0a23aab224