Prepare for merge to razrqcom

Change-Id: Ifbe5c8b205877c599bf79a0d5ca43fc2e8e089ce