Merge "Use real API 21 constant." into lmp-dev