Merge "SystemApi is @Repeatable"
am: 9e01566c50

Change-Id: Id63028253a0572d5f587684adcdf341402be3013