Merge "Fix struct vs. class mismatch in forward definitions" am: 76e37adc30 am: f4d7441eab
am: c7a047a59e

Change-Id: Id3ddac509c25c48a718fe9915f917e0cd0324135