bug_3259956 and bug_2166704

Change-Id: I71b4cc3c1111e7a4e78fb276d54a291c22fb2752
3 files changed