am: 7b3ee10 * commit '7b3ee108ce80c23f99fc5120a762ac93ad8e708a': Improvements on test case setup. Change-Id: I945cd721b3983d0be4b66af74f1c0cfd284ddfe9