In an attempt to be able to have easier code coverage... Bug: T377750 Change-Id: I556f5f2753fae77df4f34b64bccdb7d68f2825b0