manually adding commits 1b1af33..f788973..38ef72a..9bb0e94..20ed476..49c4ba2..c04b368 from aospa-legacy/manifest repo