Merge "[automerger skipped] Merge "Initialise hidden api usage logger pre-fork" am: 763747b7ce am: c14670fc8e am: 6706993777 -s ours am skip reason: change_id I80f82092ef779a7dc1f1322cb7c05ebf5e59939b with SHA1 6cd1b70a1e is in history"