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