Merge changes from topic 'highlight_fixed' into oc-dev
am: 759669988b

Change-Id: I1856f049fbb1f76e728f881c088579309b81a57c