Merge cherrypicks of [19469181] into tm-release. Change-Id: Iea3df9f5aba9ed9f05e887ddbc605d78a111272f