[automerger skipped] Merge SPL-2019-05-05 skipped: e6aae943e6

Change-Id: Ia600ecf7c829e3631b8a2e898c98b9b4337bae47