Merge ""LRX21V"" into lollipop