Merge "Merge "MediaSession2: Update Builder" into pi-dev am: 9bc5610869 am: 899db63dbd"