Merge "Follow-up commit of aosp/2329897"