Backport AbsSavedState and fixes to v4
am: 05f5ba0

* commit '05f5ba020fa6caa658c75b6d77436aa980ca0fcc':
  Backport AbsSavedState and fixes to v4

Change-Id: Ie4a9563af7c0787e91bfb41cd5909c07328eff3f