Merge "Merge "Downgrade Window JetPack" into rvc-dev am: ada8355bc5 am: 59da843b13 am: 21b220c5ec" into rvc-qpr-dev-plus-aosp