Some updates in constatnts.

Change-Id: Ie0261681ccc4480ca0c97980899e4038a1e0b85a