Merge \"Handle invalid empty args to createAutoBrightnessSpline\" into nyc-mr1-dev
am: 136e649760

Change-Id: Ieb31555a395857b991a2131769bee3488ad2d1db