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

Change-Id: I325d686498aa8185a5fb620a88da5125b824b4ad