Merge "Mark module as "secondary_user" since it uncovered bug before" am: a9a8bf6ae3 am: 8ceae71f63
am: 9ba88ea670

Change-Id: Ib819a6d4c83848bb58236c570a07d0557de01e60