Merge cherrypicks of [12986203, 12985811] into studio-4.1-release Change-Id: Ifb080600875de885756aa9d950986a95e6f7ff35