Replace deprecated MoreExecutors.sameThreadExecutor(). am: a5c71db7e0 am: 07b7df8a83
am: 592d1eec01

Change-Id: Id38c59228712fa925e8ae1fa286111c8b37e245e