- NPE: bug #4984219 - IllegalStateException: bug #4969695 Change-Id: Iaf02e669b26f9277388e0e7bffd532220ebf9bb1