Merge commit 'f8bf11a0253a32375c32cad92c841237b96696c0' into rvc-dev am: 5a5d05464a am: 2f43347fbe

Change-Id: I36e443ba6621d31a77da76a22c86f67a0b3a212f