further moved some versions to holos

Change-Id: Ia0cb4ffc41bfbc0c3fc259d839d55503b9acaef0