Test: TH Bug: 157172358 Merged-in: Ib76bd317bdd21ef6c1272d38f102f8e40b66d9b8 Change-Id: Ib76bd317bdd21ef6c1272d38f102f8e40b66d9b8 (cherry picked from commit 5c5635ac)