Merge "Make classes of LOS objects non-movable."
am: 38f0c5c42f

Change-Id: Iad7a7cde534707ec8ce0151852bd0d8fcc898047