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