Syncup 8619722 to tm related branches

Bug: 233576726
Change-Id: I290eaedbee362babc3338a2c237b8489233e6640
Signed-off-by: Wilson Sung <[email protected]>