Merge "Need GSI to support landscape LCM" into pi-dev