Merge "Sync of lib2 to AOSP."