Merge "Remove isV2App"
am: 992356cc83

Change-Id: I3fe68b9e491872ee652307cba84690b94b382c86