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

Change-Id: Iefd37bebff65054696a52cd70b3b3d8035a9b119