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

Change-Id: I16166ce1d5196b3e0651007ca57a422225726a5b