Merge "Make sync and remount support product_services."
am: 1f8147fb19

Change-Id: Ib245d9c35a1b207f6ee21d33339c60b11716f4ad