Merge "Add product property for preopting extracted APKs" am: 4856596dc6
am: d5e2cc0081

Change-Id: Idaed34db9d856fb99316e69ed0dff954d5a7c0c4