Merge "Check for amInternal nullness on user.dump()" into qt-qpr1-dev am: fc07949b31
am: 1928243d59

Change-Id: Ie3ab3075bb4645cd71460bdf1ef04e702e27c393