Merge "Check if product app is unbundled from property."
am: 2ed229287d

Change-Id: I26d106c372f584939e012dd6c2a1eaa5dfcef8c3