split it into two subclasses Test: make; Bug: 139308734 Change-Id: I7264f4d92b33664dbf4207368d1a98b207377912