Merge "Simplify code"
am: 2a1c0dd6df

Change-Id: I5bf0d9b562048887be0f01ee3b5ecff4fa8312ba