Bug: 308452948 Test: Validated in husky with all changes. Change-Id: I6496b7760e6f20b3b7e09910ed42446a1eb703cf