Birthdate & brandname bugfix

Change-Id: Idd54d8dbcbecda74ca4bf38f010d3c92947b76e1
Signed-off-by: Jeremy Ho <jujaga@gmail.com>