Merge "Fix AutoTileManagerTest" into pi-dev
am: c7a25dc939

Change-Id: I6c6639e80a65ba49bfed31512b739487ae0a42f4