Changes made by intelliJ 14.1

Change-Id: Ia130266ad994ef327629db25a18f9d5702b983f4
2 files changed