Merge "Strict-related commands porting"
am: ff9159b1df

Change-Id: Id90549f222a78664e79e2b4284fb9f2269d6803f