Merge "Remove isV2App" am: 992356cc83
am: 0c0ea183d7

Change-Id: I98f3797490d45887e35cdd92b3494759858ca977