Merge changes from topic "AMsgItem" into pi-dev
am: ec2c0359ec

Change-Id: I5d390daf7337629828e985094a1ea5fa5510b036