Merge changes from topic 'bt5-cherry-pickerry-3' into oc-dev
am: 9a4b756c9b

Change-Id: I3b18c86a3981db316369a11d91a9334a38205151