Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43