Merge "[SP16] Address comments on aosp/1172143"