Merge changes from topic "apr2" into rvc-dev am: 205d359774 am: df468c8310 am: 4aee08292d am: ed7f8eb742 am: d850bcaa7a

Change-Id: I25e5bc67d896801a590a35074a2e091bf89c3c44