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

Change-Id: I9ff9e36b3fa7c0e3c0bd4cd2048f9d0ce510399c