Merge "Minor formatting cleanup to remove overlong line" am: d6998d4bd6
am: cc935f5e6d

Change-Id: I2830664720e366792a8b35eac5295995c96461fa