Merge "Dummy implementation of the Subsecond Switching API." am: 7281c7bc8f am: 374f863100
am: 427622e1c0

Change-Id: I116cc9f18dc4aada614bde651385f1e5b2d393f6