Merge "DO NOT MERGE" into ics-scoop-plus-aosp