Merge "Follow vdc naming convention: earlyBootEnded"