This is a follow-up on commits 72f64cce2b and 47be8011c6. Change-Id: Ieae9f165facd53e888194bb98f113a9eb933366e
72f64cce2b
47be8011c6