Merge cherrypicks of [2538087, 2538144, 2538145] into oc-release

Change-Id: Ie0e851a7b62602a923ca09c3e463fb9cf0bfb65e