Merge "Merge "setDone for module only when module isn't already done" into nougat-cts-dev am: 0577f4b8e1" into nougat-mr1-cts-dev