Prepare for merge to razrqcom

Change-Id: I7c37a35a95ee2b6739ae2e34b5093c92b7ffbc5c