Merge "Merge "Merge "Apply module ID formatting from go/aog/379797 to summary" into nougat-cts-dev am: 0313139936" into nougat-mr1-cts-dev am: d67e3aa1a8"