Merge cherrypicks of [19048272] into tm-release. Change-Id: I5a85c6b087465b678bea7c2564383150b012e983