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

Change-Id: I5b2320564692df6fa14bfeb49fcf350fc4cb2d9d