New behavior makes it unnecessary

Ibf0fe5882688de makes it unnecessary to add -nopin
(also it is now an enum so the option is invalid now)

Change-Id: I86e6895472aa966c5695c61f89459d697d59392b
Merge 4.6.0 into 5.0.0

Change-Id: Ib4816ed5adf045814c5f960f1103fc67b07bd130