implements: blueprint state-normalization-support Change-Id: I6272d01f12ae4a0a901e0aa61b7defbb8e114c39