Merge "Fix minimized state messup" into nyc-dev
am: dce92891df

* commit 'dce92891df42d5ad8cdcb6ecade5b2801a14f090':
  Fix minimized state messup

Change-Id: I8aba9be1767593da365c3192bfaa89821f8bf527