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

Change-Id: I143b151134ffa4870090f0060e596adf07902e96