aosp / sr cherry pick
fix potential segfault
sideload: aosp/sr cherry picks and fixes
fix compile error
6.48.6