Merge "Increase the level of depth of apk paths" am: 401ace29db am: ec26d4b94f

Change-Id: Ib52079b204df7c1a1d6ca7a8128b3562f3619eb7