Merge changes from topic "play"
am: 297193ceed

Change-Id: I022154516e912fd25163009b3f5d2f4d1d1c8639