Bug: 62337922 This reverts commit 84c84327. Test: format issue only Change-Id: Idf6f39a50b6c3baa3cc0a2147724a5815dd6d9b4