Merge "[MS68.4] Address comments at aosp/1958144"