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

Change-Id: If03a8fc00ff08e9feb7c6758b65f2111c78cd183