tree 13ecbe6bd03f857140809a54cf7fc27d924b4316
parent 0596ac4415e4319a332b979b74a823095b2bce40
parent 6b9564e30f092fa70df8f4c2f27e69b7edd57d4a
author Luke Huang <huangluke@google.com> 1534145565 -0700
committer android-build-merger <android-build-merger@google.com> 1534145565 -0700

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

Change-Id: I692b5b5b08223b90dca4ec2930e18fa00d359ae3