"LRX21U"
"LRX21V"
Merge remote-tracking branch 'upstream/lollipop-release' into lp-mr0