Merge "Remove @Postsubmit annotations"
am: b6618922b8

Change-Id: Id04616a661bcb3ff602a89e1da11bcda7e68a338