Merge "Strict-related commands porting" am: ff9159b1df am: 0f148251c4 am: 6b9564e30f
am: b90f98f291

Change-Id: I78419a8e8dd5370a142c904c27ec55c9a783e2eb