[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3 am: 1b6f3f9a Change-Id: I49de968aa0daa18b60921af1a381f77d13a8ff0e