Merge "Return current object instead of Exception when constant state is null" into nyc-mr1-dev
am: ea6502e4d1

Change-Id: Ic3d768534d7968203fb3d32b13eaef4f1354b940