Merge cherrypicks of [19981137, 20100213] into rvc-platform-release.

Change-Id: I314731284189dc880576e3b81cde43a8f7ba7405