Bring inline with AOSP and add items as needed.

Change-Id: I174ee57dcd8141c60002418f0717735ede200182