Further fixes to OEM templates am: 5ea1946f81 am: 9f39661740
am: b0749eb70c  -s ours

Change-Id: I3a623f452648afffa2aa0e07e41627c6e5e1fc37