base: Many fix after qpr1 changes

Change-Id: I976fde83eba7158197720233b6a018ce3bc66cbf

Former-commit-id: 1f42d8123cbfed0f36ef7bc0e69117bde2c5e6ca
2 files changed