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

Change-Id: I7c346316b3a950bcfcc8c0a575c91a3aab2aa4d0