JSON Compatibility Fixes

Bug: 999967
Change-Id: I6fa1cabe3fc51411e3e79364cc8eebdc84e5ff8d
Merge "JSON Compatibility Fixes" into develop