add NS_* constants (v 1.5.0)

It is instead of I1a60e861a09ac6ee4f1bc7a3fe9de851a20ab9ad

Change-Id: I0fc30fa07baaef5f320f535b0425400e50e0df6b
Merge "add NS_* constants (v 1.5.0)"