Follow-up for commits 8b57d07a64 and 5f665a855e Change-Id: I8f0f9a7a81636623df766f9d4ea414bde9d408bc
8b57d07a64
5f665a855e