Merge commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f' into eclair-plus-aosp * commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f': b/2148252 Fix emulator
Merge commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f' into eclair-plus-aosp * commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f': b/2148252 Fix emulator