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

Change-Id: I692b5b5b08223b90dca4ec2930e18fa00d359ae3