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

Change-Id: If445d844a36df7170e91fe1dc2dd2e598db3bbc8