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

Change-Id: Idf04861560f085af98c2f1abadfbe6a89539d84f