Merge "init: ro.boottime.init.first_stage" am: a6e6c7d966
am: d8cddff7b8

Change-Id: Ibd7144b7e3b65e037384a6b81776e49e36fc91f5