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

Change-Id: Iafb7b2c123ceb1a130d9accf2c0343234101858c