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