Merge commit '753132194ff691e1533e354dddc2bc31d25e50a0' into manual_merge_753132194ff691e1533e354dddc2bc31d25e50a0

Bug: None
Test: blueline boots and property is build time configurable

Change-Id: If53ee3b26873ba230464efb2ac04112bd94d0661