Merge cherrypicks of [13454919] into mainline-release

Change-Id: I86474b0f123666fd1588b9619643856882f4bb03