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

Change-Id: I4c851576e37b0511ed002a9ab7e3505816e9b474