DO NOT MERGE: Fix bug in product path building am: 9914284d6a
am: a792c4cd7c  -s ours

Change-Id: I109f392ebca3d4b09993b8a60c9edade3ae554f1