Merge changes from topic "apr19" into rvc-dev am: b67e70aa40

Change-Id: Id459d6991890200bcb2fe5d1f8ef1db707ad9369