Merge changes from topic 'presentFenceNotReliable' into oc-dev
am: 21d072ac4a

Change-Id: If70925313d46370103d1aa09a38348fb5731bee0