This is a follow up of I8a737e2b73.

Bug: 14981300
Bug: 14419121
Change-Id: I87f910adbff248d9606d074c351aa951c9539163