Merge changes from topic 'sysui-tooltip' into oc-dev
am: 3fbcec5b86

Change-Id: I7affdad6abfb283c0eec6718797f7d8580ea507b