Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev