Android CTS 4.1 Release 4
Reconcile with AOSP

Change-Id: Ie76e413ccd50182c04e7d4cc9bfd45d0a6d63417