Seems this works, but adding the test anyway. Test: pytest Bug: None Change-Id: I32903246a037f942e87b35479d07a8f30853f9e4