AOSP: Sync with CM on 6-16-13

Change-Id: I08a14df68ab7c13919dafde3226d996269d7931a