Syncup 8585584 to tm related branches

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