Merge from AOSP staging branch

Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
tree: 4448c702d8119d90081c0ecc354197e95cbeceef
  1. core/
  2. services/