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

Change-Id: Ic5abb1e4e727a6d7869dcb7a46cee64d225c4c61