Merge branch 'stable-3.3' * stable-3.3: Address comments by Sasa Zivkov Add integration tests Fix import of InternalGroup Change-Id: I36ce6193db6d6eab20f43063af0740c2701e008d