Merge "Fix one race condition between start and stop." am: 876b13d0ec
am: 36be7e61bf

Change-Id: I6b46004ac43d1c29ebedd982be10ba33c7460968