Merge "androidboot.lrap => logical_partitions"
am: 05625ab420

Change-Id: I945697014403041bdddacf987f52d8f6d84be7b8