Merge "Use manifest fragments" into rvc-dev am: 8395d7fdb9

Change-Id: Ib924bbfe45a3efcfa84d472241af75d681cde7d4