Merge "Add test for Change-Id: Ied0412a01922b40a3f5d89bed49707498582abc1"