Merge "Writer Test: add assert for atest" am: 8d38c0af65 am: d1d4f0f9e1

Change-Id: I4c8626e455eb9cce67a296fe817f39a9ecf1bdb5