Merge "dvrapi: Pass layer_count down" into oc-dev am: 9a2b294255
am: d00f1007ef

Change-Id: I0ba89439d448ef1068a34f44e6a977c55af1d9f1