Merge "init: Don't set ro.serialno when androidboot.serialno is not set" am: 27eda482be
am: 00ac033d6c

Change-Id: I5390efe94a7de9661ad73f160a7b4ca365e84949