Merge changes from topic "play" am: 297193ceed am: b5e3d16439
am: 2c7d0350ca

Change-Id: I0301cdd6315ffd5b1e4953ee57a88a67743265a7