bug: 62904466 Test: Manually tested, added functional tests Change-Id: I5f5555d99b47550a8fef6995222d12155b4072a9