[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3 am: f98157e2ba am: 4f83bad908 am: a982645d5c skipped: 9d3e228729 am: 8a095b5f19
am: 0886b1a751

Change-Id: I6fb6521317ef9d9e2d6afab056bc8993bed9720c