[automerger skipped] Merge "Fix whitespace errors"
am: 3e3ebe58ba -s ours
am skip reason: SHA1 3e3ebe58ba skipped by user marcone

Change-Id: I99c3bebd6c37860b50d9c303260d07e9f2a98f7f