Commit for some of the critical bugs in December 20016

Test: this is a test

Change-Id: I8844dd82b0a7be912166746bd330ad3e819b81e9
26 files changed