Merge "Update intra-core API"
am: c74c272cad

Change-Id: I9e8cbca0fa06cf9da7af705842251c124c05b27f