merge: 98acc9c684f816b7db5434c2ebe5af868e98a34f:
MB-9169: slight format change

Change-Id: I6ed1814251477d39e59f46416e9e6b2f649f2356