Merge "Need GSI to support landscape LCM" into pi-dev am: 2c5f734f97
am: 12367f0622

Change-Id: I667fb6fdb6ecd318189c5811a61568a7fca76e08