Merge "Increase the level of depth of apk paths"